Auto merge of #3031 - matklad:lockfile-test, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 23 Aug 2016 20:57:48 +0000 (13:57 -0700)
committerGitHub <noreply@github.com>
Tue, 23 Aug 2016 20:57:48 +0000 (13:57 -0700)
commitb0ce1d87af41c48988e18d2277ef5dcfc9ca375a
tree61c562776b24b1134e71b8e079cf0b6df220dc95
parent41b2177cf39055533b63de0368ac98d55bf42310
parent9c5d4da2c43e48fdbf685277138e983cb1e042dc
Auto merge of #3031 - matklad:lockfile-test, r=alexcrichton

Lockfile test